Merge tag 'upstream/2.3.4'
authorDimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
Sun, 14 Feb 2016 13:09:35 +0000 (15:09 +0200)
committerDimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
Sun, 14 Feb 2016 13:09:35 +0000 (15:09 +0200)
commitd5f55e1f3fec2fff0456a7eed6abcf777b9ddce7
treeed1468244223e5e0e635973dc0845d6e959dff6a
parent5a56ae63a7b9165a9f9d22a06287fe588740bbbd
parentd43a236cf87b967008a7e19d29115f1ee6f6208d
Merge tag 'upstream/2.3.4'

Upstream version 2.3.4